Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix various typos/grammar #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/backend/freecad.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func createEntry(content string) (int) {

// FileContent contains the script to be executed by FreeCAD it will generate a file preview and a Wavefront OBJ format
// this file shall be put into the ctrlr0 bucket from the user account
// We must pass it to FreeCAD but this is a scarce ressource and that shall be done properly
// We must pass it to FreeCAD but this is a scarce resource and that shall be done properly
// If we got a system crash or whatever

// We are storing each FreeCAD script to the file system and use a named pipe to process the file
Expand Down
2 changes: 1 addition & 1 deletion src/backend/minioServer.go
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ func createMinIOServer(username string, URL string, accessToken string, secretTo
}
}

// We need to return some informations like
// We need to return some information like
// the minIO IP address, the TCPPORT
// as to properly configure the reverse proxy and route the traffic to it
// We also need to implement the user loopback as to configure the reverse proxy
Expand Down
14 changes: 7 additions & 7 deletions src/credential/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ func getPlayerCode(w http.ResponseWriter, path string, Host string, private int)

contentString := strings.Replace(string(content), "MODELSOURCE", fullPath, 1)

// We must use the NEWCODE stuff to request additionnal object parts
// We must use the NEWCODE stuff to request additional object parts
code := ""

if ( partNbInt != -1 ) {
Expand Down Expand Up @@ -979,7 +979,7 @@ func recomputeProject(w http.ResponseWriter, r *http.Request, path string, priva
data.Key = keys[0]
data.SecretKey = secretKey
data.URI = urlhost
// We need to substract the base port
// We need to subtract the base port
// from the urlport
i, _ := strconv.Atoi(urlport)
i = i - base.MinIOServerBasePort
Expand Down Expand Up @@ -1078,7 +1078,7 @@ func userCallback(w http.ResponseWriter, r *http.Request) {
case http.MethodGet:
context := strings.Split(r.URL.Path, "/")
// Check anonymous call
// We must do that test only if the retreived data is private
// We must do that test only if the retrieved data is private
// If it is not private
if ( checkAccess(w,r,context[2]) ) {
keyWords := strings.Split(r.URL.Path, "/")
Expand Down Expand Up @@ -1265,10 +1265,10 @@ func main() {
print("| Private use only |\n")
print("=============================== \n")

// The project backend data are stored within a minio instances
// These datas are the metadatas of the end user and we shall be sure that
// they are resilient to system crash etc
// We also need to be sure that they scale per server
// The project backend data is stored within a minio instance
// This data is the metadata of the end user and we should be sure that
// it is resilient to system crashes etc...
// We also need to be sure that it scales per server

start_minio()

Expand Down
6 changes: 3 additions & 3 deletions src/credential/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ func userGetInfo(nickname string) (*userPublic) {
return_value.TokenAuth = temp_value.TokenAuth
return_value.TokenAuthRW = "0"
return_value.TokenSecret = temp_value.TokenSecret
return_value.TokenSecretLABEL = "TokenType, TokenAuth and TokenSecret are private values that you shouldn't share with anybody. They are automatically assigned to you as to provide you unique authentication capabilities to JustYour.Parts services. Use them to connect you to the service through FreeCAD or an Amazon s3 compliant client. Please refer to our end user documentation for further informations."
return_value.TokenSecretLABEL = "TokenType, TokenAuth and TokenSecret are private values that you shouldn't share with anybody. They are automatically assigned to you as to provide you unique authentication capabilities to JustYour.Parts services. Use them to connect you to the service through FreeCAD or an Amazon s3 compliant client. Please refer to our end user documentation for further information."
return_value.TokenSecretRW = "0"
return_value.CreationDate = temp_value.CreationDate
return_value.CreationDateRW = "0"
return_value.Lastlogin = temp_value.Lastlogin
return_value.LastloginRW = "0"
return_value.Email = temp_value.Email
return_value.EmailLABEL = "Your primary email address. It won't be shared with anybody except if you explicitely activate that feature into the privacy field. Warning your email address must be verified each time you change it. During that process your account is disabled and can't be recovered without contacting us."
return_value.EmailLABEL = "Your primary email address. It won't be shared with anybody except if you explicitly activate that feature into the privacy field. Warning your email address must be verified each time you change it. During that process your account is disabled and can't be recovered without contacting us."
return_value.EmailRW = "1"
}

Expand Down Expand Up @@ -143,7 +143,7 @@ func updateAccount(username string, w http.ResponseWriter, r *http.Request) (boo

_ = json.Unmarshal(getJSON, &newData)

// So now let's run some comparaison
// So now let's run some comparison
if ( updatedData.Active == 0 ) {
http.Error(w, "401 User not activated Please check email", 401)
return false
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/master.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ func home(w http.ResponseWriter, r *http.Request) {

// This code is looking for the TCP port and the URL of the minio server corresponding
// to the user defined with its public key
// We excute there the original request
// We execute there the original request

keys := strings.Split(words[1],":")
cacheURI := os.Getenv("CACHE_URI")
Expand Down
6 changes: 3 additions & 3 deletions src/static/html/myAccountWarning.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<br>
<div id="warningMessage" tabindex="-1" class="alert alert-danger" role="alert">
<h4 class="alert-heading">WARNING</h4>
<p>Your account deletion will remove all your files from our servers without the possibility to restore them. Please backup your critical datas</p>
<p>Your account deletion will remove all your files from our servers without the possibility to restore them. Please backup your critical data</p>
<hr>
Please switch off this trigger if you are willing to let the community having the opportunity to keep enjoying your public work.
Please switch off this trigger if you are willing to let the community have the opportunity to keep enjoying your public work.
By doing so your public projects will stay hosted on our platform and will be available to the community. <b>If you do not deactivate this option, your public work will be erased.</b>
<div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="customSwitch1" checked>
<label class="custom-control-label" for="customSwitch1">Delete my whole datas</label>
<label class="custom-control-label" for="customSwitch1">Delete all my data</label>
</div>
<label class="col-form-label" for="MyPasswordDelete">Password</label>
<span contenteditable="true" class="form-control" id="MyPasswordDelete"
Expand Down
8 changes: 4 additions & 4 deletions src/static/js/myaccount.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ function myAccountCol1createControl()
var myJSON='{';
RWFormArray.forEach(function(element) {
// We must print the variable content except if this is password entry because in that case the real value is
// within the global vairable array
// within the global variable array
if ( element.includes("Password") == true ) {
myJSON = myJSON + '"' + element + '":"' + mylocalStorage[element] + '"';
}
Expand Down Expand Up @@ -284,7 +284,7 @@ function myAccountCol1createControl()
if ( response == 'email' || response == 'passwordemail' ) {
// We must clear the window and close the session
// inform the end user
form="<center><h1> Your account has been temporarly deactivated </h1>";
form="<center><h1> Your account has been temporarily deactivated </h1>";
form=form+"<h2>Please revalidate your email<h2>";
form=form+"<h3>Redirecting in 5s<h3>";
$('#col1').html(form);
Expand Down Expand Up @@ -348,7 +348,7 @@ function myAccountCol1createControl()
}
if ( response == 'error password' ) {
form='<center><h1 style="color: #FF0000"> Password change error </h1>';
form=form + "<h2> There was a password missmatch please retry </h2></center>";
form=form + "<h2> There was a password mismatch please retry </h2></center>";
form=form+"<h3>Redirecting in 5s<h3>";
$('#col1').html(form);
$('#col2').html('');
Expand Down Expand Up @@ -422,7 +422,7 @@ function myAccountCol1()
var obj = JSON.parse( data );
var myarray = Object.keys(obj);
for (let i = 0; i < myarray.length; i++) {
// The last 2 characters are giving us the RW informations
// The last 2 characters give us the RW information
// There shall be also a Label ;)
if ( myarray[i].substr(-2) != "RW" ) {
if ( myarray[i].substr(-5) != "LABEL" ) {
Expand Down
6 changes: 3 additions & 3 deletions src/static/myAccountWarning.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<br>
<div id="warningMessage" tabindex="-1" class="alert alert-danger" role="alert">
<h4 class="alert-heading">WARNING</h4>
<p>Your account deletion will remove all your files from our servers without the possibility to restore them. Please backup your critical datas</p>
<p>Your account deletion will remove all your files from our servers without the possibility to restore them. Please backup your critical data</p>
<hr>
Please switch off this trigger if you are willing to let the community having the opportunity to keep enjoying your public work.
Please switch off this trigger if you are willing to let the community have the opportunity to keep enjoying your public work.
By doing so your public projects will stay hosted on our platform and will be available to the community. <b>If you do not deactivate this option, your public work will be erased.</b>
<div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="customSwitch1" checked>
<label class="custom-control-label" for="customSwitch1">Delete my whole datas</label>
<label class="custom-control-label" for="customSwitch1">Delete all my data</label>
</div>
<label class="col-form-label" for="MyPassword">Password</label>
<span contenteditable="true" class="form-control" id="MyPassword"
Expand Down
2 changes: 1 addition & 1 deletion start
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export MINIO_URI=127.0.0.1
export CACHE_URI=127.0.0.1
export CACHE_TCPPORT=:9500
export TZ=GMT
echo "Please set the following environement variables in PRODUCTION mode
echo "Please set the following environment variables in PRODUCTION mode
export SMTP_SERVER=
export SMTP_ACCOUNT=
export SMTP_PASSWORD=
Expand Down
2 changes: 1 addition & 1 deletion start_container
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export MINIO_URI=127.0.0.1
export CACHE_URI=127.0.0.1
export CACHE_TCPPORT=:9500
export TZ=GMT
echo "Please set the following environement variables in PRODUCTION mode
echo "Please set the following environment variables in PRODUCTION mode
export SMTP_SERVER=
export SMTP_ACCOUNT=
export SMTP_PASSWORD=
Expand Down