Skip to content
This repository was archived by the owner on Apr 12, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
b3534d5
Pages
andyruwruw Feb 10, 2022
d3cdff5
Add text fields and buttons to review page
carlosm-o Feb 10, 2022
d9221a7
Show List
andyruwruw Feb 10, 2022
6fc4eb0
Merge Conflict
andyruwruw Feb 10, 2022
5b14934
Add text fields and buttons to login page
carlosm-o Feb 10, 2022
8ddaa13
New Layout
andyruwruw Feb 10, 2022
cb88cfc
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
andyruwruw Feb 10, 2022
aea78f6
Beautiful Nav Drawer
andyruwruw Feb 10, 2022
c1d5ef7
Discover Page
andyruwruw Feb 11, 2022
4103f12
Draft UI
andyruwruw Feb 11, 2022
b418de5
Build Errors
andyruwruw Feb 11, 2022
5bb7267
Removing Subdirectory
andyruwruw Feb 14, 2022
e7e344c
README changes
andyruwruw Feb 14, 2022
1a11589
Divide views into directories
andyruwruw Feb 14, 2022
5032269
Backend Structure
Feb 14, 2022
7d1f746
Beginning Linking API
andyruwruw Feb 15, 2022
8920afc
Some Queries
andyruwruw Feb 15, 2022
9f5cc85
DAOs
andyruwruw Feb 16, 2022
24bbda5
Adding find, update and delete to all DAO
Feb 16, 2022
f2e36e9
Auth Handlers
Feb 16, 2022
6006c86
Logout Handler
Feb 17, 2022
81e164e
Few Handlers
andyruwruw Feb 17, 2022
4ac4601
Script
andyruwruw Feb 17, 2022
a4a38ef
Working search query
andyruwruw Feb 17, 2022
7f9622c
Light additions of unique DAOs
andyruwruw Feb 18, 2022
c7a8edf
Some small changes?
Feb 18, 2022
fb164ff
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
Feb 18, 2022
b31ce08
Update various SQL queries to work with mariadb
carlosm-o Feb 21, 2022
b7c48cf
Database working?
andyruwruw Mar 2, 2022
11d2105
Adding Queries
andyruwruw Mar 2, 2022
13d6a97
DAO Refactor
andyruwruw Mar 2, 2022
4b032b0
Finished Daos
Mar 3, 2022
38e44c2
Cache Daos
Mar 3, 2022
881528a
Fixed a few Handlers
andyruwruw Mar 3, 2022
2873018
Refactored Endpoints
andyruwruw Mar 3, 2022
363d3ff
Create Sample Data
andyruwruw Mar 4, 2022
77c2421
Update various sql queries
carlosm-o Mar 4, 2022
bbb1990
Working Client
andyruwruw Mar 4, 2022
f58e309
Shared Changes
andyruwruw Mar 4, 2022
115e9f2
API Layer
andyruwruw Mar 4, 2022
9bd1201
Handler Edits
andyruwruw Mar 4, 2022
a9ff227
Finish updating sql queries
carlosm-o Mar 4, 2022
e515781
Update various sql queries
carlosm-o Mar 4, 2022
fad2c55
Login Page
andyruwruw Mar 4, 2022
75a029c
Working Login
andyruwruw Mar 4, 2022
bf2e564
DAO Single Returns
andyruwruw Mar 4, 2022
aa7c47c
Update sql queries
carlosm-o Mar 4, 2022
dea19e9
Merge branch 'develop' of https://github.com/andyruwruw/consumed-cont…
carlosm-o Mar 4, 2022
d7bfa63
Login Working
andyruwruw Mar 4, 2022
e94d977
Client work
andyruwruw Mar 4, 2022
17a9369
Component Adjustements
andyruwruw Mar 4, 2022
14a1014
Sample Data
andyruwruw Mar 7, 2022
144b551
Vercel + Express
andyruwruw Mar 10, 2022
216da45
Create Data Updates
andyruwruw Mar 11, 2022
22fad27
Express Bug
andyruwruw Mar 11, 2022
e971108
Edit User
andyruwruw Mar 11, 2022
364f966
Compiling Frontend
andyruwruw Mar 11, 2022
72a2cbc
Server Builds
andyruwruw Mar 11, 2022
2c928d0
making everything work
andyruwruw Mar 15, 2022
63bbaa4
Build
andyruwruw Mar 15, 2022
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
3 changes: 0 additions & 3 deletions .browserslistrc

This file was deleted.

7 changes: 0 additions & 7 deletions .editorconfig

This file was deleted.

18 changes: 0 additions & 18 deletions .eslintrc.js

This file was deleted.

90 changes: 90 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: CI

on:
pull_request:
push:
branches:
- main

env:
node_version: '14.x'

jobs:
test-server:
name: Test Server 📡
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Set Up Node ${{ env.node_version }}
uses: actions/setup-node@v1
with:
node-version: ${{ env.node_version }}

- name: Cache NPM
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Install Dependencies
run: npm ci --prefer-offline

- name: Run tests
run: npm run test

lint-server:
name: Lint Server 🛠️
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Set Up Node ${{ env.node_version }}
uses: actions/setup-node@v1
with:
node-version: ${{ env.node_version }}

- name: Cache NPM
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Install Dependencies
run: npm ci --prefer-offline

- name: Lint
run: npm run lint

lint-client:
name: Lint Client 🖥️
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2

- name: Set Up Node ${{ env.node_version }}
uses: actions/setup-node@v1
with:
node-version: ${{ env.node_version }}

- name: Cache NPM
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Install Dependencies
working-directory: ./client
run: npm ci --prefer-offline

- name: Lint
working-directory: ./client
run: npm run lint
24 changes: 2 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
.DS_Store
node_modules
/dist


# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
.env
.vercel
78 changes: 78 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<p align="center">
<h1>
Consumed Content
</h1>
</p>

<p align="center">
Categorize and review your favorite shows and movies.
<p>

<p align="center">
<a href="#">Live Site</a>
·
<a href="https://github.com/andyruwruw">Andrew Young</a>
·
<a href="https://github.com/LosM-ro">Carlos Muro</a>
</p>

Consumed Content was made for CS 340 at Oregon State University.

The website allows users to save their favorite movies, make custom categories, and write their own reviews.

# Table of Contents

- [Usage](#usage)
- [Data](#data)

# Usage

We're running a Vue.js project with Vercel serverless functions.

To run the repository with the backend you'll need to install [Vercel CLI](https://vercel.com/cli):

```
$ npm i -g vercel
```

That will let you run the backend as well as the frontend.

From here, you'll need to install the repository's dependencies:

```
$ npm i
```

To run the frontend and backend locally:

```
$ npm run serve
```

To run just the frontend you can use:

```
$ npm run serve:client
```

The repository is linted using airbnb config:

```
$ npm run lint
```

You can also have eslint automatically fix minor violations:

```
$ npm run lint --fix
```

To build for production:

```
$ npm run build
```
# Data

- Movies and Shows
- [The Movie Database API](https://developers.themoviedb.org/3/getting-started/introduction)
4 changes: 4 additions & 0 deletions client/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ module.exports = {
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'@typescript-eslint/no-empty-function': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'import/prefer-default-export': 'off',
'max-len': 'off',
'@typescript-eslint/no-empty-interface': 'off',
},
};
4 changes: 3 additions & 1 deletion client/.gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.DS_Store
node_modules
/dist


# local env files
.env.local
.env.*.local
.env

# Log files
npm-debug.log*
Expand All @@ -21,3 +21,5 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?

.vercel
24 changes: 0 additions & 24 deletions client/README.md
Original file line number Diff line number Diff line change
@@ -1,24 +0,0 @@
# consumed-content

## Project setup
```
npm install
```

### Compiles and hot-reloads for development
```
npm run serve
```

### Compiles and minifies for production
```
npm run build
```

### Lints and fixes files
```
npm run lint
```

### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
1 change: 1 addition & 0 deletions client/dist/css/app.90e067cd.css

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

1 change: 1 addition & 0 deletions client/dist/css/chunk-230e0f06.6827d77b.css

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

1 change: 1 addition & 0 deletions client/dist/css/chunk-42f7ec50.611db412.css

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

1 change: 1 addition & 0 deletions client/dist/css/chunk-5592286e.f23a838b.css

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

1 change: 1 addition & 0 deletions client/dist/css/chunk-5d353bfc.4a07d04c.css

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

1 change: 1 addition & 0 deletions client/dist/css/chunk-72c3ab2a.ff5f3265.css

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

Loading