turbotraktor
/
ladylilia.com
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename comments to twitch-logs

Browse Source
master
Nikola Forró 6 years ago
parent b0f957c0fc
commit f72a9cc6de
56 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

22
Dockerfile
Unescape View File

@ -10,16 +10,6 @@ COPY apps/quotes .
RUN $(npm bin)/ng build --prod --build-optimizer --output-hashing=none RUN $(npm bin)/ng build --prod --build-optimizer --output-hashing=none
WORKDIR /build-comments
COPY apps/comments/package.json apps/comments/package-lock.json ./
RUN npm install && mkdir /comments && cp -r node_modules/ /comments
WORKDIR /comments
COPY apps/comments .
RUN $(npm bin)/ng build --prod --build-optimizer --output-hashing=none
WORKDIR /build-schedule WORKDIR /build-schedule
COPY apps/schedule/package.json apps/schedule/package-lock.json ./ COPY apps/schedule/package.json apps/schedule/package-lock.json ./
@ -30,13 +20,23 @@ COPY apps/schedule .
RUN $(npm bin)/ng build --prod --build-optimizer --output-hashing=none RUN $(npm bin)/ng build --prod --build-optimizer --output-hashing=none
WORKDIR /build-twitch-logs
COPY apps/twitch-logs/package.json apps/twitch-logs/package-lock.json ./
RUN npm install && mkdir /twitch-logs && cp -r node_modules/ /twitch-logs
WORKDIR /twitch-logs
COPY apps/twitch-logs .
RUN $(npm bin)/ng build --prod --build-optimizer --output-hashing=none
FROM nginx:alpine FROM nginx:alpine
COPY nginx/nginx.conf /etc/nginx/nginx.conf COPY nginx/nginx.conf /etc/nginx/nginx.conf
COPY --from=builder /quotes/dist /quotes/quotes/assets COPY --from=builder /quotes/dist /quotes/quotes/assets
COPY --from=builder /comments/dist /comments/comments/assets
COPY --from=builder /schedule/dist /schedule/schedule/assets COPY --from=builder /schedule/dist /schedule/schedule/assets
COPY --from=builder /twitch-logs/dist /twitch-logs/twitch-logs/assets
RUN addgroup -g 9999 lilia RUN addgroup -g 9999 lilia

2
apps/comments/.angular-cli.json → apps/twitch-logs/.angular-cli.json
Unescape View File

@ -1,7 +1,7 @@
{ {
"$schema": "./node_modules/@angular/cli/lib/config/schema.json", "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": { "project": {
"name": "comments" "name": "twitch-logs"
}, },
"apps": [ "apps": [
{ {

0
apps/comments/.editorconfig → apps/twitch-logs/.editorconfig
Unescape View File

0
apps/comments/.gitignore → apps/twitch-logs/.gitignore vendored
Unescape View File

0
apps/comments/README.md → apps/twitch-logs/README.md
Unescape View File

0
apps/comments/e2e/app.e2e-spec.ts → apps/twitch-logs/e2e/app.e2e-spec.ts
Unescape View File

0
apps/comments/e2e/app.po.ts → apps/twitch-logs/e2e/app.po.ts
Unescape View File

0
apps/comments/e2e/tsconfig.e2e.json → apps/twitch-logs/e2e/tsconfig.e2e.json
Unescape View File

0
apps/comments/karma.conf.js → apps/twitch-logs/karma.conf.js
Unescape View File

0
apps/comments/package-lock.json → apps/twitch-logs/package-lock.json generated
Unescape View File

0
apps/comments/package.json → apps/twitch-logs/package.json
Unescape View File

0
apps/comments/protractor.conf.js → apps/twitch-logs/protractor.conf.js
Unescape View File

0
apps/comments/src/app/app.component.css → apps/twitch-logs/src/app/app.component.css
Unescape View File

0
apps/comments/src/app/app.component.html → apps/twitch-logs/src/app/app.component.html
Unescape View File

0
apps/comments/src/app/app.component.spec.ts → apps/twitch-logs/src/app/app.component.spec.ts
Unescape View File

0
apps/comments/src/app/app.component.ts → apps/twitch-logs/src/app/app.component.ts
Unescape View File

0
apps/comments/src/app/app.module.ts → apps/twitch-logs/src/app/app.module.ts
Unescape View File

0
apps/comments/src/app/comments/comments.component.css → apps/twitch-logs/src/app/comments/comments.component.css
Unescape View File

0
apps/comments/src/app/comments/comments.component.html → apps/twitch-logs/src/app/comments/comments.component.html
Unescape View File

0
apps/comments/src/app/comments/comments.component.ts → apps/twitch-logs/src/app/comments/comments.component.ts
Unescape View File

0
apps/comments/src/app/models/comment.ts → apps/twitch-logs/src/app/models/comment.ts
Unescape View File

0
apps/comments/src/app/models/video.ts → apps/twitch-logs/src/app/models/video.ts
Unescape View File

0
apps/comments/src/app/pipes/splitbadges.pipe.ts → apps/twitch-logs/src/app/pipes/splitbadges.pipe.ts
Unescape View File

0
apps/comments/src/app/pipes/splitmessage.pipe.ts → apps/twitch-logs/src/app/pipes/splitmessage.pipe.ts
Unescape View File

0
apps/comments/src/app/pipes/tohms.pipe.ts → apps/twitch-logs/src/app/pipes/tohms.pipe.ts
Unescape View File

0
apps/comments/src/app/services/comments.datasource.ts → apps/twitch-logs/src/app/services/comments.datasource.ts
Unescape View File

4
apps/comments/src/app/services/comments.service.ts → apps/twitch-logs/src/app/services/comments.service.ts
Unescape View File

@ -21,7 +21,7 @@ export class CommentsService {
filter = '', sortBy = 'recorded_at', sortOrder = 'desc', filter = '', sortBy = 'recorded_at', sortOrder = 'desc',
pageNumber = 0, pageSize = 20): Observable<any> { pageNumber = 0, pageSize = 20): Observable<any> {
return this.http.get('/comments/api/videos', { return this.http.get('/twitch-logs/api/videos', {
observe: 'response', observe: 'response',
params: new HttpParams() params: new HttpParams()
.set('filter', filter) .set('filter', filter)
@ -41,7 +41,7 @@ export class CommentsService {
filter = '', sortBy = 'offset', sortOrder = 'asc', filter = '', sortBy = 'offset', sortOrder = 'asc',
pageNumber = 0, pageSize = 20): Observable<any> { pageNumber = 0, pageSize = 20): Observable<any> {
return this.http.get('/comments/api/videos/' + videoID + '/comments', { return this.http.get('/twitch-logs/api/videos/' + videoID + '/comments', {
observe: 'response', observe: 'response',
params: new HttpParams() params: new HttpParams()
.set('filter', filter) .set('filter', filter)

2
apps/comments/src/app/services/images.service.ts → apps/twitch-logs/src/app/services/images.service.ts
Unescape View File

@ -43,7 +43,7 @@ export class ImagesService {
} }
getEmotes(): Observable<any> { getEmotes(): Observable<any> {
return this.http.get('/comments/api/emotes').pipe( return this.http.get('/twitch-logs/api/emotes').pipe(
map((res: any[]) => { map((res: any[]) => {
return res.map((emote: any) => ({ return res.map((emote: any) => ({
id: emote.id, id: emote.id,

0
apps/comments/src/app/services/videos.datasource.ts → apps/twitch-logs/src/app/services/videos.datasource.ts
Unescape View File

0
apps/comments/src/app/videos/videos.component.css → apps/twitch-logs/src/app/videos/videos.component.css
Unescape View File

0
apps/comments/src/app/videos/videos.component.html → apps/twitch-logs/src/app/videos/videos.component.html
Unescape View File

0
apps/comments/src/app/videos/videos.component.ts → apps/twitch-logs/src/app/videos/videos.component.ts
Unescape View File

0
apps/comments/src/assets/.gitkeep → apps/twitch-logs/src/assets/.gitkeep
Unescape View File

0
apps/comments/src/environments/environment.prod.ts → apps/twitch-logs/src/environments/environment.prod.ts
Unescape View File

0
apps/comments/src/environments/environment.ts → apps/twitch-logs/src/environments/environment.ts
Unescape View File

0
apps/comments/src/favicon.ico → apps/twitch-logs/src/favicon.ico
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

4
apps/comments/src/index.html → apps/twitch-logs/src/index.html
Unescape View File

@ -2,8 +2,8 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Comments</title> <title>Twitch Logs</title>
<base href="/comments/"> <base href="/twitch-logs/">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico" sizes="16x16 32x32 48x48"> <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico" sizes="16x16 32x32 48x48">

0
apps/comments/src/main.ts → apps/twitch-logs/src/main.ts
Unescape View File

0
apps/comments/src/polyfills.ts → apps/twitch-logs/src/polyfills.ts
Unescape View File

0
apps/comments/src/styles.css → apps/twitch-logs/src/styles.css
Unescape View File

0
apps/comments/src/test.ts → apps/twitch-logs/src/test.ts
Unescape View File

0
apps/comments/src/theme.scss → apps/twitch-logs/src/theme.scss
Unescape View File

0
apps/comments/src/tsconfig.app.json → apps/twitch-logs/src/tsconfig.app.json
Unescape View File

0
apps/comments/src/tsconfig.spec.json → apps/twitch-logs/src/tsconfig.spec.json
Unescape View File

0
apps/comments/src/typings.d.ts → apps/twitch-logs/src/typings.d.ts vendored
Unescape View File

0
apps/comments/tsconfig.json → apps/twitch-logs/tsconfig.json
Unescape View File

0
apps/comments/tslint.json → apps/twitch-logs/tslint.json
Unescape View File

12
docker-compose.yaml.example
Unescape View File

@ -11,7 +11,7 @@ services:
- 127.0.0.1:8080:80 - 127.0.0.1:8080:80
depends_on: depends_on:
- quotes-api - quotes-api
- comments-api - twitch-logs-api
- cms - cms
# Quotes API service with /data/quotes mounted as database storage # Quotes API service with /data/quotes mounted as database storage
@ -27,16 +27,16 @@ services:
expose: expose:
- 5000 - 5000
# Twitch comments API service with /data/comments mounted as database storage # Twitch logs API service with /data/twitch-logs mounted as database storage
# TWITCH_CLIENT_ID, TWITCH_OAUTH_TOKEN and TWITCH_CHANNEL_ID are needed for # TWITCH_CLIENT_ID, TWITCH_OAUTH_TOKEN and TWITCH_CHANNEL_ID are needed for
# Twitch API access and synchronization # Twitch API access and synchronization
comments-api: twitch-logs-api:
build: build:
context: ./comments-api context: ./twitch-logs-api
volumes: volumes:
- /data/comments:/comments - /data/twitch-logs:/twitch-logs
environment: environment:
- SQLALCHEMY_DATABASE_URI=sqlite:////comments/comments.db - SQLALCHEMY_DATABASE_URI=sqlite:////twitch-logs/twitch-logs.db
- TWITCH_CLIENT_ID=__TWITCH_CLIENT_ID__ - TWITCH_CLIENT_ID=__TWITCH_CLIENT_ID__
- TWITCH_OAUTH_TOKEN=__TWITCH_OAUTH_TOKEN__ - TWITCH_OAUTH_TOKEN=__TWITCH_OAUTH_TOKEN__
- TWITCH_CHANNEL_ID=__TWITCH_CHANNEL_ID__ - TWITCH_CHANNEL_ID=__TWITCH_CHANNEL_ID__

14
nginx/nginx.conf
Unescape View File

@ -52,14 +52,14 @@ http {
root /quotes; root /quotes;
} }
location ^~ /comments/assets/ {
root /comments;
}
location ^~ /schedule/assets/ { location ^~ /schedule/assets/ {
root /schedule; root /schedule;
} }
location ^~ /twitch-logs/assets/ {
root /twitch-logs;
}
location ^~ /quotes/api/ { location ^~ /quotes/api/ {
rewrite ^/quotes/api(/.*)$ $1 break; rewrite ^/quotes/api(/.*)$ $1 break;
proxy_set_header Host $host; proxy_set_header Host $host;
@ -69,13 +69,13 @@ http {
proxy_pass http://quotes-api:5000/; proxy_pass http://quotes-api:5000/;
} }
location ^~ /comments/api/ { location ^~ /twitch-logs/api/ {
rewrite ^/comments/api(/.*)$ $1 break; rewrite ^/twitch-logs/api(/.*)$ $1 break;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_http_version 1.1; proxy_http_version 1.1;
tcp_nodelay on; tcp_nodelay on;
proxy_pass http://comments-api:5000/; proxy_pass http://twitch-logs-api:5000/;
} }
location ~ /\.ht { location ~ /\.ht {

0
comments-api/.gitignore → twitch-logs-api/.gitignore vendored
Unescape View File

0
comments-api/Dockerfile → twitch-logs-api/Dockerfile
Unescape View File

0
comments-api/app.py → twitch-logs-api/app.py
Unescape View File

0
comments-api/db.py → twitch-logs-api/db.py
Unescape View File

0
comments-api/requirements.txt → twitch-logs-api/requirements.txt
Unescape View File

0
comments-api/sync.py → twitch-logs-api/sync.py
Unescape View File

0
comments-api/twitch.py → twitch-logs-api/twitch.py
Unescape View File

Write Preview
Loading…
Cancel
Save