Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
Merge branch 'staging' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
gheorghelupu17 authored Feb 5, 2020
2 parents ae08357 + 069aa19 commit 35796b3
Show file tree
Hide file tree
Showing 425 changed files with 173,589 additions and 15,810 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
indent_style = tab
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

Expand Down
21 changes: 17 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,28 @@ jobs:
uses: actions/npm@master
with:
args: install
- name: Update environments file
env:
RVM_BASE_URL: ${{ secrets.RVM_BASE_URL }}
RVM_SERVER_URL: ${{ secrets.RVM_SERVER_URL }}
run: |
ENVIRONMENTS_FILE="$GITHUB_WORKSPACE/src/environments/environment.stage.ts"
sed -i "s#SERVER_URL#${RVM_SERVER_URL}#g" $ENVIRONMENTS_FILE
sed -i "s#SERVER_BASE_URL#${RVM_BASE_URL}#g" $ENVIRONMENTS_FILE
echo "$(cat $ENVIRONMENTS_FILE)"
- name: Build the solution
uses: actions/npm@master
with:
args: "run-script build:prod"
args: "run-script build:stage"
- name: Deploy the solution
uses: contention/rsync-deployments@master
env:
DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
RVM_MACHINE: ${{ secrets.RVM_MACHINE }}
RVM_USERNAME: ${{ secrets.RVM_USERNAME }}
with:
args: -arv --omit-dir-times --include="dist/a/*" $RVM_USERNAME@$RVM_MACHINE:/var/www/html/
run: |
DEPLOY_FOLDER="$GITHUB_WORKSPACE/dist/a/"
SSH_PATH="$HOME/.ssh"
mkdir "$SSH_PATH"
echo "$DEPLOY_KEY" > "$SSH_PATH/deploy_key"
chmod 600 "$SSH_PATH/deploy_key"
sh -c "rsync -rvz --omit-dir-times -e 'ssh -i $SSH_PATH/deploy_key -o StrictHostKeyChecking=no' $DEPLOY_FOLDER $RVM_USERNAME@$RVM_MACHINE:/var/www/html/"
8 changes: 8 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
RewriteRule ^(.*) index.html [NC,L]
</IfModule>
4 changes: 2 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"singleQuote": true,
"useTabs": false,
"tabWidth": 2,
"useTabs": true,
"tabWidth": 4,
"semi": true,
"bracketSpacing": true
}
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ DSU (Departamentul pentru Situatii de Urgenta) needs a digital tool to manage th

[Contributing](#contributing) | [Built with](#built-with) | [Repos and projects](#repos-and-projects) | [Deployment](#deployment) | [Feedback](#feedback) | [License](#license) | [About Code4Ro](#about-code4ro)


## Contributing

This project is built by amazing volunteers and you can be one of them! Here's a list of ways in [which you can contribute to this project](.github/CONTRIBUTING.MD).
Expand All @@ -31,7 +32,7 @@ Angular

### Package managers

Yarn
NPM

### Database technology & provider

Expand Down Expand Up @@ -59,3 +60,5 @@ This project is licensed under the MPL 2.0 License - see the [LICENSE](LICENSE)
Started in 2016, Code for Romania is a civic tech NGO, official member of the Code for All network. We have a community of over 500 volunteers (developers, ux/ui, communications, data scientists, graphic designers, devops, it security and more) who work pro-bono for developing digital solutions to solve social problems. #techforsocialgood. If you want to learn more details about our projects [visit our site](https://www.code4.ro/en/) or if you want to talk to one of our staff members, please e-mail us at [email protected].

Last, but not least, we rely on donations to ensure the infrastructure, logistics and management of our community that is widely spread across 11 timezones, coding for social change to make Romania and the world a better place. If you want to support us, [you can do it here](https://code4.ro/en/donate/).


15 changes: 15 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"src/manifest.json"
],
"styles": [
"node_modules/custom-select-dropdown/dist/assets/style.css",
"src/styles.scss",
"src/assets/scss/style.scss"
],
Expand Down Expand Up @@ -60,6 +61,16 @@
"with": "src/environments/environment.prod.ts"
}
]
},
"stage": {
"sourceMap": true,
"aot": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.stage.ts"
}
]
}
}
},
Expand All @@ -70,13 +81,17 @@
},
"configurations": {
"local": {
"port": 4300,
"browserTarget": "rvm-client:build:local"
},
"development": {
"browserTarget": "rvm-client:build:development"
},
"production": {
"browserTarget": "rvm-client:build:production"
},
"stage": {
"browserTarget": "rvm-client:build:stage"
}
}
},
Expand Down
266 changes: 266 additions & 0 deletions documentation/classes/EmailValidation.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
<!doctype html>
<html class="no-js" lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>rvm-client documentation</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="icon" type="image/x-icon" href="../images/favicon.ico">
<link rel="stylesheet" href="../styles/style.css">
</head>
<body>

<div class="navbar navbar-default navbar-fixed-top visible-xs">
<a href="../" class="navbar-brand">rvm-client documentation</a>
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
</div>

<div class="xs-menu menu" id="mobile-menu">
<div id="book-search-input" role="search"><input type="text" placeholder="Type to search"></div> <compodoc-menu></compodoc-menu>
</div>

<div class="container-fluid main">
<div class="row main">
<div class="hidden-xs menu">
<compodoc-menu mode="normal"></compodoc-menu>
</div>
<!-- START CONTENT -->
<div class="content class">
<div class="content-data">











<ol class="breadcrumb">
<li>Classes</li>
<li>EmailValidation</li>
</ol>

<ul class="nav nav-tabs" role="tablist">
<li class="active">
<a href="#info" role="tab" id="info-tab" data-toggle="tab" data-link="info">Info</a>
</li>
<li >
<a href="#source" role="tab" id="source-tab" data-toggle="tab" data-link="source">Source</a>
</li>
</ul>

<div class="tab-content">
<div class="tab-pane fade active in" id="c-info">
<p class="comment">
<h3>File</h3>
</p>
<p class="comment">
<code>src/app/core/validators/email-validation.ts</code>
</p>





<section>
<h3 id="index">Index</h3>
<table class="table table-sm table-bordered index-table">
<tbody>

<tr>
<td class="col-md-4">
<h6><b>Methods</b></h6>
</td>
</tr>
<tr>
<td class="col-md-4">
<ul class="index-list">
<li>
<span class="modifier">Static</span>
<a href="#emailValidation">emailValidation</a>
</li>
</ul>
</td>
</tr>





</tbody>
</table>
</section>



<section>

<h3 id="methods">
Methods
</h3>
<table class="table table-sm table-bordered">
<tbody>
<tr>
<td class="col-md-4">
<a name="emailValidation"></a>
<span class="name">
<b>
<span class="modifier">Static</span>
emailValidation
</b>
<a href="#emailValidation"><span class="icon ion-ios-link"></span></a>
</span>
</td>
</tr>
<tr>
<td class="col-md-4">
<span class="modifier-icon icon ion-ios-reset"></span>
<code>emailValidation(abstractControl: <a href="https://angular.io/api/forms/AbstractControl" target="_blank">AbstractControl</a>)</code>
</td>
</tr>


<tr>
<td class="col-md-4">
<div class="io-line">Defined in <a href="" data-line="7"
class="link-to-prism">src/app/core/validators/email-validation.ts:7</a></div>
</td>
</tr>


<tr>
<td class="col-md-4">
<div class="io-description"><p>Email validator for reactive forms</p>
</div>

<div class="io-description">
<b>Parameters :</b>
<table class="params">
<thead>
<tr>
<td>Name</td>
<td>Type</td>
<td>Optional</td>
</tr>
</thead>
<tbody>
<tr>
<td>abstractControl</td>
<td>
<code><a href="https://angular.io/api/forms/AbstractControl" target="_blank" >AbstractControl</a></code>
</td>

<td>
No
</td>


</tr>
</tbody>
</table>
</div>
<div>
</div>
<div class="io-description">
<b>Returns : </b> <code><a href="https://www.typescriptlang.org/docs/handbook/basic-types.html" target="_blank" >any</a></code>

</div>
<div class="io-description">

</div>
</td>
</tr>
</tbody>
</table>
</section>





</div>


<div class="tab-pane fade tab-source-code" id="c-source">
<pre class="line-numbers compodoc-sourcecode"><code class="language-typescript">import { AbstractControl } from &#x27;@angular/forms&#x27;;

export class EmailValidation {
/**
* Email validator for reactive forms
*/
static emailValidation(abstractControl: AbstractControl): any {
const email &#x3D; abstractControl.value;
const reg &#x3D; new RegExp(/^[a-z0-9\._%+-]+@[a-z0-9\.-]+\.[a-z]{2,4}$/);

if (reg.test(email)) {
return null;
}

return { &#x27;email&#x27;: &#x27;Adresa de email introdusă nu este validă (ex: [email protected]).&#x27; };
}
}
</code></pre>
</div>
</div>








</div><div class="search-results">
<div class="has-results">
<h1 class="search-results-title"><span class='search-results-count'></span> result-matching "<span class='search-query'></span>"</h1>
<ul class="search-results-list"></ul>
</div>
<div class="no-results">
<h1 class="search-results-title">No results matching "<span class='search-query'></span>"</h1>
</div>
</div>
</div>
<!-- END CONTENT -->
</div>
</div>

<script>
var COMPODOC_CURRENT_PAGE_DEPTH = 1;
var COMPODOC_CURRENT_PAGE_CONTEXT = 'class';
var COMPODOC_CURRENT_PAGE_URL = 'EmailValidation.html';
</script>

<script src="../js/libs/custom-elements.min.js"></script>
<script src="../js/libs/lit-html.js"></script>
<!-- Required to polyfill modern browsers as code is ES5 for IE... -->
<script src="../js/libs/custom-elements-es5-adapter.js" charset="utf-8" defer></script>
<script src="../js/menu-wc.js" defer></script>

<script src="../js/libs/bootstrap-native.js"></script>

<script src="../js/libs/es6-shim.min.js"></script>
<script src="../js/libs/EventDispatcher.js"></script>
<script src="../js/libs/promise.min.js"></script>
<script src="../js/libs/zepto.min.js"></script>

<script src="../js/compodoc.js"></script>

<script src="../js/tabs.js"></script>
<script src="../js/menu.js"></script>
<script src="../js/libs/clipboard.min.js"></script>
<script src="../js/libs/prism.js"></script>
<script src="../js/sourceCode.js"></script>
<script src="../js/search/search.js"></script>
<script src="../js/search/lunr.min.js"></script>
<script src="../js/search/search-lunr.js"></script>
<script src="../js/search/search_index.js"></script>
<script src="../js/lazy-load-graphs.js"></script>


</body>
</html>
Loading

0 comments on commit 35796b3

Please sign in to comment.