Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Site
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
24
Issues
24
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Indienet
Site
Commits
de93411c
Verified
Commit
de93411c
authored
Mar 14, 2018
by
Aral Balkan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
All Nuxt/Vue client files now in client/ directory. Progress on
#23
parent
eee06092
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
20 additions
and
8 deletions
+20
-8
client/assets/data.json
client/assets/data.json
+0
-0
client/assets/readme.md
client/assets/readme.md
+0
-0
client/components/contentTypeFilter.vue
client/components/contentTypeFilter.vue
+0
-0
client/components/followModal.vue
client/components/followModal.vue
+0
-0
client/components/indieHeader.vue
client/components/indieHeader.vue
+0
-0
client/components/search.vue
client/components/search.vue
+0
-0
client/components/settings.vue
client/components/settings.vue
+1
-1
client/components/textComposer.vue
client/components/textComposer.vue
+0
-0
client/layouts/default.vue
client/layouts/default.vue
+0
-0
client/mixins/socket.js
client/mixins/socket.js
+0
-0
client/pages/index.vue
client/pages/index.vue
+0
-0
client/plugins/buefy.js
client/plugins/buefy.js
+0
-0
client/plugins/vue-password.js
client/plugins/vue-password.js
+0
-0
client/plugins/vue-quill-editor.js
client/plugins/vue-quill-editor.js
+0
-0
client/static/2560.jpg
client/static/2560.jpg
+0
-0
client/static/6029.jpg
client/static/6029.jpg
+0
-0
client/static/background-image.jpg
client/static/background-image.jpg
+0
-0
client/static/not-available.png
client/static/not-available.png
+0
-0
client/static/plus.svg
client/static/plus.svg
+0
-0
client/static/profile-image.jpg
client/static/profile-image.jpg
+0
-0
client/static/settings.svg
client/static/settings.svg
+0
-0
client/store/index.js
client/store/index.js
+0
-0
nuxt.config.js
nuxt.config.js
+3
-0
package.json
package.json
+1
-1
server/app.js
server/app.js
+3
-3
server/lib/activity.js
server/lib/activity.js
+4
-1
server/middleware/response-writers/activitypub.js
server/middleware/response-writers/activitypub.js
+4
-1
server/public/favicon.ico
server/public/favicon.ico
+0
-0
server/services/site-configuration/site-configuration.class.js
...r/services/site-configuration/site-configuration.class.js
+4
-1
No files found.
assets/data.json
→
client/
assets/data.json
View file @
de93411c
File moved
assets/readme.md
→
client/
assets/readme.md
View file @
de93411c
File moved
components/contentTypeFilter.vue
→
c
lient/c
omponents/contentTypeFilter.vue
View file @
de93411c
File moved
components/followModal.vue
→
c
lient/c
omponents/followModal.vue
View file @
de93411c
File moved
components/indieHeader.vue
→
c
lient/c
omponents/indieHeader.vue
View file @
de93411c
File moved
components/search.vue
→
c
lient/c
omponents/search.vue
View file @
de93411c
File moved
components/settings.vue
→
c
lient/c
omponents/settings.vue
View file @
de93411c
...
...
@@ -71,7 +71,7 @@
<
script
>
import
vueColorCompact
from
'
~/node_modules/vue-color/src/components/Compact.vue
'
import
vueColorCompact
from
'
~/
../
node_modules/vue-color/src/components/Compact.vue
'
export
default
{
components
:
{
...
...
components/textComposer.vue
→
c
lient/c
omponents/textComposer.vue
View file @
de93411c
File moved
layouts/default.vue
→
client/
layouts/default.vue
View file @
de93411c
File moved
mixins/socket.js
→
client/
mixins/socket.js
View file @
de93411c
File moved
pages/index.vue
→
client/
pages/index.vue
View file @
de93411c
File moved
plugins/buefy.js
→
client/
plugins/buefy.js
View file @
de93411c
File moved
plugins/vue-password.js
→
client/
plugins/vue-password.js
View file @
de93411c
File moved
plugins/vue-quill-editor.js
→
client/
plugins/vue-quill-editor.js
View file @
de93411c
File moved
static/2560.jpg
→
client/
static/2560.jpg
View file @
de93411c
File moved
static/6029.jpg
→
client/
static/6029.jpg
View file @
de93411c
File moved
static/background-image.jpg
→
client/
static/background-image.jpg
View file @
de93411c
File moved
static/not-available.png
→
client/
static/not-available.png
View file @
de93411c
File moved
static/plus.svg
→
client/
static/plus.svg
View file @
de93411c
File moved
static/profile-image.jpg
→
client/
static/profile-image.jpg
View file @
de93411c
File moved
static/settings.svg
→
client/
static/settings.svg
View file @
de93411c
File moved
store/index.js
→
client/
store/index.js
View file @
de93411c
File moved
nuxt.config.js
View file @
de93411c
const
path
=
require
(
'
path
'
)
module
.
exports
=
{
// The Nuxt/Vue client source is in the client/ folder
srcDir
:
'
client/
'
,
loading
:
{
color
:
'
#92D3CE
'
},
...
...
package.json
View file @
de93411c
...
...
@@ -23,7 +23,7 @@
},
"scripts"
:
{
"build"
:
"nuxt build"
,
"dev"
:
"DEBUG=nuxt:* nodemon --watch
server/ --watch config/
server/index.js"
,
"dev"
:
"DEBUG=nuxt:* nodemon --watch
client/ --watch server/ --watch config/ --watch nuxt.config.js
server/index.js"
,
"prestart"
:
"npm run build"
,
"start"
:
"NODE_ENV=production node server/"
,
"test"
:
"npm run -s mocha"
,
...
...
server/app.js
View file @
de93411c
const
path
=
require
(
'
path
'
)
const
favicon
=
require
(
'
serve-favicon
'
)
//
const path = require('path')
//
const favicon = require('serve-favicon')
const
compress
=
require
(
'
compression
'
)
const
cors
=
require
(
'
cors
'
)
const
helmet
=
require
(
'
helmet
'
)
...
...
@@ -40,7 +40,7 @@ if (process.env.NODE_ENV !== 'test') {
}
app
.
use
(
express
.
urlencoded
({
extended
:
true
}))
app
.
use
(
favicon
(
path
.
join
(
app
.
get
(
'
public
'
),
'
favicon.ico
'
)))
//
app.use(favicon(path.join(app.get('public'), 'favicon.ico')))
// Host the public folder
// app.use('/', express.static(app.get('public')))
...
...
server/lib/activity.js
View file @
de93411c
...
...
@@ -10,7 +10,10 @@
// @ts-check
const
{
ContentType
}
=
require
(
'
../lib/http-constants
'
)
const
siteConfiguration
=
require
(
'
../../assets/data.json
'
)
// TODO: Refactor (the data file will be moved to the person’s home directory
// – see: https://source.ind.ie/indienet/site/issues/20)
const
siteConfiguration
=
require
(
'
../../client/assets/data.json
'
)
const
domain
=
siteConfiguration
.
domain
const
url
=
`https://
${
domain
}
/`
...
...
server/middleware/response-writers/activitypub.js
View file @
de93411c
const
{
ContentType
,
HTTPStatusCode
}
=
require
(
'
../../lib/http-constants
'
)
const
{
domain
}
=
require
(
'
../../../assets/data.json
'
)
// TODO: Refactor (the data file will be moved to the person’s home directory
// – see: https://source.ind.ie/indienet/site/issues/20)
const
{
domain
}
=
require
(
'
../../../client/assets/data.json
'
)
module
.
exports
=
(
request
,
response
,
activityStreamsObject
,
addWebfingerLink
=
false
)
=>
{
const
writeResponse
=
()
=>
{
...
...
public/favicon.ico
→
server/
public/favicon.ico
View file @
de93411c
File moved
server/services/site-configuration/site-configuration.class.js
View file @
de93411c
// @ts-check
const
winston
=
require
(
'
../../lib/log
'
)
// eslint-disable-line no-unused-vars
const
siteConfiguration
=
require
(
'
../../../assets/data.json
'
)
// TODO: Refactor (the data file will be moved to the person’s home directory
// – see: https://source.ind.ie/indienet/site/issues/20)
const
siteConfiguration
=
require
(
'
../../../client/assets/data.json
'
)
class
Service
{
constructor
(
options
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment