Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .docker/drash.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ RUN curl -fsSL https://deno.land/x/install/install.sh | DENO_INSTALL=/usr/local
WORKDIR /var/www/src

# npm i and build client
COPY src/package.json src/package-lock.json src/webpack.config.js ./
COPY src/tsconfig.json src/deno.json ./
COPY src/public public
COPY src/vue vue
RUN npm i && npm run webpack
RUN deno task build

# Copy over other src code
COPY src/. .
Expand Down
7 changes: 0 additions & 7 deletions .github/dependabot.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: denoland/setup-deno@v1

- name: Formatter
run: deno fmt --check --ignore='src/public,src/vue,src/package.json,src/webpack.config.js'
run: deno fmt --check

- name: Linter
run: deno lint --ignore='src/public,src/vue,src/package.json,src/webpack.config.js'
run: deno lint
12 changes: 0 additions & 12 deletions DEV.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Contents

- [Login to Postgres Container](#login-to-postgres-container)
- [Make a DB Data Dump](#make-a-db-data-dump-update-the-db)
- [Creating a Database](#creating-a-database)
- [Updating Deno](#updating-deno)

# Login to Postgres Container

Expand All @@ -13,12 +10,3 @@ $ psql -U user
# \c realworld
# select * from users;
```

# Problems in Vue

## `article.tags` returns as `["""]`

When sent down from the server, the `article.tags` property is `""`. But when
vue gets it from the `axios` response, the property is `[""]`. This seems to be
a problem with vue, and to combat it, we have added the following checks into
the tag components: `v-if="tags.length !== 1 && !!tags[0]"`.
13 changes: 4 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ and docker-compose.
```
$ docker-compose build && docker-compose up -d
$ docker-compose exec drash bash
# /root/.deno/bin/nessie migrate
# /root/.deno/bin/nessie seed
# deno task prepare
# deno task build
```

Navigate to `localhost:1667`
Expand All @@ -30,7 +30,7 @@ Navigate to `localhost:1667`
- [ ] API container?
- [ ] Web socket?
- [x] Database model representations
- [x] Vue (built with webpack using Vue Single File Components)
- [x] Destiny as the frontend reactive UI library
- [ ] Cypress

# Frontend login
Expand All @@ -51,16 +51,11 @@ Email: user32@hotmail.com
proxy server for Drash
- [Deno](https://deno.land) - Javascript and Typescript runtime
- [Drash](https://drash.land/drash) - Web server
- [Vue](https://vuejs.org/) - Frontend framework
- [Webpack](https://webpack.js.org/) - Bundling Vue
- [Destiny](https://github.com/ebebbington/destiny) - Frontend framework
- [Postgres](https://github.com/deno-postgres/deno-postgres) - Postgres driver
for the applications database
- [Bcrypt](https://github.com/jamesbroadberry/deno-bcrypt/tree/master) - Hashing
and comparing passwords
- [Rhum](https://github.com/drashland/rhum) - Testing framework
- [Dmm](https://github.com/drashland/dmm) - Module Manager for Deno to update
our dependencies
- [Vue-input](https://www.npmjs.com/package/@johmun/vue-tags-input) - Library
used to help the display of article tags as 'pills', allowing them to be
removed and added like a shopping cart
- [Cypress](https://cypress.io/) - Browser testing framework
10 changes: 6 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,18 @@ services:
- ./src/resources:/var/www/src/resources
- ./src/services:/var/www/src/services
- ./src/tests:/var/www/src/tests
- ./src/vue:/var/www/src/vue
- ./src/deno.json:/var/www/src/deno.json
- ./src/config.ts:/var/www/src/config.ts
- ./src/app.ts:/var/www/src/app.ts
- ./src/deps.ts:/var/www/src/deps.ts
- ./src/nessie.config.ts:/var/www/src/nessie.config.ts
- ./src/package.json:/var/www/src/package.json
- ./src/package-lock.json:/var/www/src/package-lock.json
- ./src/server.ts:/var/www/src/server.ts
- ./src/webpack.config.js:/var/www/src/webpack.config.js
- ./src/.env:/var/www/src/.env
- ./src/public/views/index.html:/var/www/src/public/views/index.html
- ./src/tsconfig.json:/var/www/src/tsconfig.json
- ./src/public/js/components:/var/www/src/public/js/components
- ./src/public/js/app.ts:/var/www/src/public/js/app.ts
- ./src/public/js/state.ts:/var/www/src/public/js/state.ts
ports:
- "1667:1667"
networks:
Expand Down
3 changes: 2 additions & 1 deletion src/deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"tasks": {
"prepare": "/root/.deno/bin/nessie migrate && /root/.deno/bin/nessie seed",
"test": "deno test -A --unstable tests/integration"
"test": "deno test -A --unstable tests/integration",
"build": "deno bundle -c tsconfig.json public/js/app.ts public/js/app.js"
}
}
Loading