Skip to content

Commit

Permalink
WIP choices
Browse files Browse the repository at this point in the history
  • Loading branch information
umaar committed Jul 18, 2020
1 parent 8117a44 commit ba9f751
Show file tree
Hide file tree
Showing 17 changed files with 672 additions and 61 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ ENV ?= development

install:
npm install
echo '' > node_modules/interpret/mjs-stub.js
echo 'Doing a weird hack to address https://github.com/knex/knex/issues/3882'

update-deps:
ncu -u
Expand All @@ -22,7 +24,7 @@ reset:
rm -rf ~/Downloads/video-everyday/segments/*
rm -rf ~/Downloads/video-everyday/thumbnails/*
rm db-development-video-everyday.sqlite
npm run migrate-db-dev
make migrate

clean-dist:
rm -rf dist
Expand Down
39 changes: 22 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
"express-session": "^1.17.1",
"fluent-ffmpeg": "^2.1.2",
"forcedomain": "^2.0.0",
"knex": "^0.21.1",
"knex": "^0.21.2",
"moment": "^2.27.0",
"nunjucks": "^3.2.1",
"passport": "^0.4.1",
"rimraf": "^3.0.2",
"sharp": "^0.25.4",
"signale": "^1.4.0",
"slugify": "^1.4.4",
"sqlite3": "^5.0.0",
"subtitle": "^2.0.3"
},
Expand All @@ -39,7 +40,7 @@
"gulp-rev-rewrite": "^3.0.3",
"gulp-sass": "^4.1.0",
"gulp-sourcemaps": "^2.6.5",
"rollup": "^2.21.0",
"rollup": "^2.22.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-terser": "^6.1.0",
Expand Down
2 changes: 0 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ The web interface allows you to (optionally) select which media to use in your f

- Persist choices to DB
- Playlist functionality (so you can make multiple videos)
+ Needs 1x choices table
* fields: choice_id, date bucket, media item ID,
+ needs a playlists table
* CRUD support for playlist names
* Creation of a new playlist entry needs new records in the choices table (i.e. the defaults)
Expand Down
38 changes: 0 additions & 38 deletions src/client/css/base/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,6 @@

* { box-sizing: border-box }

body {
font-family: 'Open Sans', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
margin: 0;
padding: 0;
padding-bottom: 10px;
background: white;
}

a {
color: #00B7FF;
}

ul, ol {
padding-left: 0;
Expand Down Expand Up @@ -59,28 +46,3 @@ ul, ol {
.container {
@include container;
}

input[type="submit"],
button[type="submit"] {
font-size: 15px;
padding: 10px;
}

.form-group {
margin: 25px 0;
display: flex;
flex-direction: column;

label {
margin-bottom: 10px;
}


button[type="submit"],
input[type="password"],
input[type="email"] {
padding: 10px;
border: 1px solid #ddd;
font-size: 15px;
}
}
Loading

0 comments on commit ba9f751

Please sign in to comment.