Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
CCS Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
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
xiphon
CCS Backend
Commits
d74def2e
Commit
d74def2e
authored
Jan 28, 2019
by
xiphon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename FFS to CCS
parent
cb11f518
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
28 deletions
+27
-28
app/Console/Commands/ProcessProposals.php
app/Console/Commands/ProcessProposals.php
+4
-4
app/Console/Commands/UpdateSiteProposals.php
app/Console/Commands/UpdateSiteProposals.php
+3
-3
database/factories/ProjectFactory.php
database/factories/ProjectFactory.php
+1
-2
resources/views/projects/donate.blade.php
resources/views/projects/donate.blade.php
+17
-17
resources/views/welcome.blade.php
resources/views/welcome.blade.php
+2
-2
No files found.
app/Console/Commands/ProcessProposals.php
View file @
d74def2e
...
...
@@ -59,9 +59,9 @@ class ProcessProposals extends Command
return
$result
;
}
private
const
layoutToState
=
[
'f
fs-f
r'
=>
'FUNDING-REQUIRED'
,
'
ffs-
wip'
=>
'WORK-IN-PROGRESS'
,
'
ffs-
cp'
=>
'COMPLETED'
];
private
const
layoutToState
=
[
'fr'
=>
'FUNDING-REQUIRED'
,
'wip'
=>
'WORK-IN-PROGRESS'
,
'cp'
=>
'COMPLETED'
];
/**
* Execute the console command.
*/
...
...
@@ -123,7 +123,7 @@ class ProcessProposals extends Command
}
/**
* Gets the
ffs
variables out the top of the file
* Gets the
proposal
variables out the top of the file
*
* @param string $filename
* @return array
...
...
app/Console/Commands/UpdateSiteProposals.php
View file @
d74def2e
...
...
@@ -16,7 +16,7 @@ class UpdateSiteProposals extends Command
*
* @var string
*/
protected
$signature
=
'
ffs
:update'
;
protected
$signature
=
'
proposal
:update'
;
/**
* The console command description.
...
...
@@ -46,7 +46,7 @@ class UpdateSiteProposals extends Command
$this
->
getProposals
(
'Work in Progress'
,
'WORK-IN-PROGRESS'
),
];
$json
=
json_encode
(
$response
,
JSON_UNESCAPED_SLASHES
|
JSON_PRETTY_PRINT
);
\
Storage
::
put
(
'
ff
s.json'
,
$json
);
\
Storage
::
put
(
'
proposal
s.json'
,
$json
);
$response
=
[
$this
->
getProposals
(
'Completed Proposals'
,
'COMPLETED'
),
...
...
@@ -108,7 +108,7 @@ class UpdateSiteProposals extends Command
$prop
->
name
=
$proposal
->
title
;
$prop
->
{
'donate-url'
}
=
url
(
"projects/
{
$proposal
->
subaddr_index
}
/donate"
);
$prop
->
{
'gitlab-url'
}
=
$proposal
->
gitlab_url
;
$prop
->
{
'local-url'
}
=
'/
forum-funding-system/
proposals/'
.
pathinfo
(
$proposal
->
filename
,
PATHINFO_FILENAME
)
.
'.html'
;
$prop
->
{
'local-url'
}
=
'/proposals/'
.
pathinfo
(
$proposal
->
filename
,
PATHINFO_FILENAME
)
.
'.html'
;
$prop
->
milestones
=
$proposal
->
milestones
;
$prop
->
{
'milestones-completed'
}
=
$proposal
->
milestones_completed
;
$milestones_percentage
=
min
(
100
,
(
int
)((
$proposal
->
milestones_completed
*
100
)
/
$proposal
->
milestones
));
...
...
database/factories/ProjectFactory.php
View file @
d74def2e
...
...
@@ -3,8 +3,7 @@
use
Faker\Generator
as
Faker
;
$factory
->
define
(
\
App\Project
::
class
,
function
(
Faker
$faker
)
{
$state
=
$faker
->
randomElement
([
'OPENED'
,
'IDEA'
,
'FUNDING-REQUIRED'
,
'WORK-IN-PROGRESS'
,
'COMPLETED'
]);
$status
=
$faker
->
randomElement
([
'opened'
,
'closed'
,
'locked'
,
'merged'
]);
$state
=
$faker
->
randomElement
([
'FUNDING-REQUIRED'
,
'WORK-IN-PROGRESS'
,
'COMPLETED'
]);
return
[
'title'
=>
$faker
->
sentence
(),
'subaddr_index'
=>
$faker
->
randomNumber
(),
...
...
resources/views/projects/donate.blade.php
View file @
d74def2e
...
...
@@ -6,7 +6,7 @@
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
FFS
</title>
<title>
CCS - Donate {{$project->title}}
</title>
<link
rel=
"apple-touch-icon"
sizes=
"180x180"
href=
"/meta/apple-touch-icon.png"
>
<link
rel=
"icon"
type=
"image/png"
sizes=
"32x32"
href=
"/meta/favicon-32x32.png"
>
...
...
@@ -34,19 +34,19 @@
<div
class=
"row"
>
<div
class=
"col-xs-12"
>
<div
class=
"text-center nav-item mob"
>
<a
href=
"/
forum-funding-system/
ideas/"
class=
"top-link"
>
Ideas
</a>
<a
href=
"/ideas/"
class=
"top-link"
>
Ideas
</a>
</div>
<div
class=
"text-center nav-item mob"
>
<a
href=
"/f
orum-funding-system/f
unding-required/"
>
Funding Required
</a>
<a
href=
"/funding-required/"
>
Funding Required
</a>
</div>
<div
class=
"text-center nav-item mob"
>
<a
href=
"/
forum-funding-system/
work-in-progress/"
>
Work in Progress
</a>
<a
href=
"/work-in-progress/"
>
Work in Progress
</a>
</div>
<div
class=
"text-center nav-item mob"
>
<a
href=
"/
forum-funding-system/
completed-proposals/"
>
Completed Tasks
</a>
<a
href=
"/completed-proposals/"
>
Completed Tasks
</a>
</div>
<div
class=
"text-center nav-item mob"
>
<a
href=
"/
forum-funding-system/
completed-proposals/"
>
Back to Getmonero.org
</a>
<a
href=
"/completed-proposals/"
>
Back to Getmonero.org
</a>
</div>
</div>
</div>
...
...
@@ -59,16 +59,16 @@
<nav
class=
"container"
>
<div
class=
"row middle-xs"
>
<div
class=
"col-lg-4 col-md-4 col-sm-4 col-xs-4"
>
<
a
href=
"/forum-funding-system/"
><img
src=
"/img/monero-logo.png"
alt=
"Monero Logo"
class=
"monero-logo"
></a
>
<
p
class=
"site-name"
><a
href=
"/"
>
Community Crowdfunding System
</a></p
>
</div>
<div
class=
"col-lg-8 col-md-8 col-sm-8 items end-xs"
>
<div
class=
"row end-xs middle-xs"
>
<div
class=
"col-md-12"
>
<a
href=
"/
forum-funding-system/
ideas/"
class=
"top-link"
>
Ideas
</a>
<a
href=
"/f
orum-funding-system/f
unding-required/"
>
Funding Required
</a>
<a
href=
"/
forum-funding-system/
work-in-progress/"
>
Work in Progress
</a>
<a
href=
"/
forum-funding-system/
completed-proposals/"
>
Completed Tasks
</a>
<a
href=
"
/forum-funding-system/completed-proposals/
"
>
Getmonero.org
</a>
<a
href=
"/ideas/"
class=
"top-link"
>
Ideas
</a>
<a
href=
"/funding-required/"
>
Funding Required
</a>
<a
href=
"/work-in-progress/"
>
Work in Progress
</a>
<a
href=
"/completed-proposals/"
>
Completed Tasks
</a>
<a
href=
"
https://getmonero.org
"
>
Getmonero.org
</a>
</div>
</div>
</div>
...
...
@@ -77,8 +77,8 @@
</div>
<div
class=
"mob bot-nav white-nav"
>
<div
class=
"row middle-xs"
>
<div
class=
"col-xs-
6
"
>
<
a
href=
"/"
><img
src=
"/img/monero-logo.png"
alt=
"Monero Logo"
class=
"monero-logo"
></a
>
<div
class=
"col-xs-
12
"
>
<
p
class=
"site-name"
><a
href=
"/"
>
Community Crowdfunding System
</a></p
>
</div>
</div>
</div>
...
...
@@ -88,9 +88,9 @@
<div
class=
"container ffs-breadcrumbs"
>
<div
class=
"row"
>
<div
class=
"col-xs-12"
>
<p><a
href=
"/
forum-funding-system/
"
>
Forum Funding System
</a></p>
<p><a
href=
"/f
orum-funding-system/f
unding-required/"
>
Funding Required
</a></p>
<p><a
href=
"/
forum-funding-system/
proposals/{{pathinfo($project->filename, PATHINFO_FILENAME)}}.html"
>
{{$project->title}}
</a></p>
<p><a
href=
"/"
>
Forum Funding System
</a></p>
<p><a
href=
"/funding-required/"
>
Funding Required
</a></p>
<p><a
href=
"/proposals/{{pathinfo($project->filename, PATHINFO_FILENAME)}}.html"
>
{{$project->title}}
</a></p>
<p
class=
"bread-active"
>
Contribute
</p>
</div>
</div>
...
...
resources/views/welcome.blade.php
View file @
d74def2e
...
...
@@ -5,7 +5,7 @@
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
Monero
FF
S
</title>
<title>
Monero
CC
S
</title>
<!-- Fonts -->
<link
href=
"https://fonts.googleapis.com/css?family=Nunito:200,600"
rel=
"stylesheet"
type=
"text/css"
>
...
...
@@ -79,7 +79,7 @@
<div
class=
"content"
>
<div
class=
"title m-b-md"
>
Monero
FF
S
Monero
CC
S
</div>
<div
class=
"links"
>
...
...
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